(shell-mode): Don't read history from /dev/null.

diff --git a/lisp/shell.el b/lisp/shell.el
index 8c38328b82fb25aede386a157efcf89e6c1a7288..010af64ba1fa55e1af0f94d700d6951b9769611f 100644 (file)
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -346,6 +346,8 @@ buffer."
              (cond ((string-equal shell "bash") "~/.bash_history")
                    ((string-equal shell "ksh") "~/.sh_history")
                    (t "~/.history"))))
+    (if (equal comint-input-ring-file-name "/dev/null")
+       (setq comint-input-ring-file-name nil))
     (setq shell-dirstack-query
          (if (string-match "^k?sh$" shell) "pwd" "dirs")))
   (run-hooks 'shell-mode-hook)